QSQL/ODBC: fix regression (trailing NUL)
authorDebian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Sun, 17 Sep 2023 03:46:01 +0000 (04:46 +0100)
committerRaspbian forward porter <root@raspbian.org>
Sun, 17 Sep 2023 03:46:01 +0000 (04:46 +0100)
commit133afea3bf88a894c7f1989beee9579682dd533f
tree8dbd587df04ae9bb006b60cb62c12284f7aaa38e
parentf3cc82c5f5d02d118bc46803f8f1750340d30da0
QSQL/ODBC: fix regression (trailing NUL)

Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9020034b3b6a3a81
Last-Update: 2023-06-30

When we fixed the callers of toSQLTCHAR() to use the result's size()
instead of the input's (which differ, if sizeof(SQLTCHAR) != 2), we
exposed callers to the append(0), which changes the size() of the
result QVLA. Callers that don't rely on NUL-termination (all?) now saw
an additional training NUL.

Fix by not NUL-terminating, and changing the only user of SQL_NTS to
use an explicit length.

Gbp-Pq: Name sql_odbc_fix_unicode_check.diff
src/plugins/sqldrivers/odbc/qsql_odbc.cpp